Merge.
authorSteven Smith <ssmith@xensource.com>
Tue, 31 Oct 2006 10:12:35 +0000 (10:12 +0000)
committerSteven Smith <ssmith@xensource.com>
Tue, 31 Oct 2006 10:12:35 +0000 (10:12 +0000)
commit98f201b0e52492cf8e29ec7c0521b76fd5fb0128
treeb75990f0a320d032df0a071699aab40a5960dccb
parent111a11e5f5e068658d126d7ee2672aea9e633c1b
parentbcaf50a45872a1f9ba3f006f539409517007ca70
Merge.